Regenerate.

diff --git a/gpsbabel/mingw/wintesto.cmd b/gpsbabel/mingw/wintesto.cmd
index 9d835bc921c78dfcc4addb1104f810a1b491fc38..8345c74223f087944f5e21715a39938513dda43d 100644 (file)
--- a/gpsbabel/mingw/wintesto.cmd
+++ b/gpsbabel/mingw/wintesto.cmd
@@ -236,12 +236,30 @@ REM GPX output.
 %PNAME% -i mapsource -f reference\mapsource.mps  -o mapsource -F %TMPDIR%\ms.mps\r
 %PNAME% -i mapsource -f %TMPDIR%\ms.mps -o gpx -F %TMPDIR%\ms2.gpx\r
 CALL :COMPARE %TMPDIR%\ms1.gpx %TMPDIR%\ms2.gpx\r
+\r
 REM\r
 REM MRCB mapsource track test\r
 REM\r
 DEL %TMPDIR%\mps-track.mps\r
 %PNAME% -t -i mapsource -f reference\track\mps-track.mps -o mapsource -F %TMPDIR%\mps-track.mps\r
 CALL :COMPARE %TMPDIR%\mps-track.mps reference\track\r
+REM Now do a test of reading waypoints from a track-only file - should have an empty result\r
+DEL %TMPDIR%\mps-track.mps\r
+%PNAME% -i mapsource -f reference\track\mps-track.mps -o mapsource -F %TMPDIR%\mps-track.mps\r
+CALL :COMPARE %TMPDIR%\mps-track.mps reference\mps-empty.mps\r
+\r
+REM\r
+REM MRCB mapsource route test\r
+REM\r
+DEL %TMPDIR%\mps-route.mps\r
+%PNAME% -r -i mapsource -f reference\route\route.mps -o mapsource,mpsverout=4 -F %TMPDIR%\mps-route.mps\r
+CALL :COMPARE %TMPDIR%\mps-route.mps reference\route\route.mps\r
+\r
+REM Now do a test of reading tracks from a route-only file - should have an empty result\r
+DEL %TMPDIR%\mps-route.mps\r
+%PNAME% -t -i mapsource -f reference\route\route.mps -o mapsource -F %TMPDIR%\mps-route.mps\r
+CALL :COMPARE %TMPDIR%\mps-route.mps reference\mps-empty.mps\r
+\r
 REM\r
 REM Geocaching Database is a binary Palm format that, like the GPX variants\r
 REM has a zillion "equivalent" encodings of any given record set.  So we\r
@@ -340,6 +358,44 @@ REM Navicache.
 CALL :COMPARE %TMPDIR%\navi.wpt reference\navicache.ref\r
 REM\r
 \r
+REM PsiTrex.  A text format that can't be handled by XCSV due to context of\r
+REM data based on other data values in the file\r
+REM Waypoints first\r
+DEL %TMPDIR%\psit-ww.txt %TMPDIR%\psit-ww.mps\r
+%PNAME% -i psitrex -f reference\psitwpts.txt -o mapsource -F %TMPDIR%\psit-ww.mps\r
+%PNAME% -i mapsource -f %TMPDIR%\psit-ww.mps -o psitrex -F %TMPDIR%\psit-ww.txt\r
+CALL :COMPARE reference\psitwpts.txt %TMPDIR%\psit-ww.txt\r
+\r
+REM Now test correct "empty" handling - ask for routes when there aren't any\r
+REM Uses mapsource as the empty handling for this has already happened above\r
+DEL %TMPDIR%\psit-wr.mps\r
+%PNAME% -r -i psitrex -f reference\psitwpts.txt -o mapsource -F %TMPDIR%\psit-wr.mps\r
+CALL :COMPARE reference\mps-empty.mps %TMPDIR%\psit-wr.mps\r
+\r
+REM Routes next\r
+DEL %TMPDIR%\psit-rr.txt %TMPDIR%\psit-rr.mps\r
+%PNAME% -r -i psitrex -f reference\route\psitrtes.txt -o mapsource -F %TMPDIR%\psit-rr.mps\r
+%PNAME% -r -i mapsource -f %TMPDIR%\psit-rr.mps -o psitrex -F %TMPDIR%\psit-rr.txt\r
+CALL :COMPARE reference\route\psitrtes.txt %TMPDIR%\psit-rr.txt\r
+\r
+REM Now test correct "empty" handling - ask for tracks when there aren't any\r
+REM Uses mapsource as the empty handling for this has already happened above\r
+DEL %TMPDIR%\psit-rt.mps\r
+%PNAME% -t -i psitrex -f reference\route\psitrtes.txt -o mapsource -F %TMPDIR%\psit-rt.mps\r
+CALL :COMPARE reference\mps-empty.mps %TMPDIR%\psit-rt.mps\r
+\r
+REM Tracks last\r
+DEL %TMPDIR%\psit-tt.txt %TMPDIR%\psit-tt.mps\r
+%PNAME% -t -i psitrex -f reference\track\psittrks.txt -o mapsource -F %TMPDIR%\psit-tt.mps\r
+%PNAME% -t -i mapsource -f %TMPDIR%\psit-tt.mps -o psitrex -F %TMPDIR%\psit-tt.txt\r
+CALL :COMPARE reference\track\psittrks.txt %TMPDIR%\psit-tt.txt\r
+\r
+REM Now test correct "empty" handling - ask for waypoints when there aren't any\r
+REM Uses mapsource as the empty handling for this has already happened above\r
+DEL %TMPDIR%\psit-tw.mps\r
+%PNAME% -i psitrex -f reference\track\psittrks.txt -o mapsource -F %TMPDIR%\psit-tw.mps\r
+CALL :COMPARE reference\mps-empty.mps %TMPDIR%\psit-tw.mps\r
+\r
 REM\r
 REM Arc Distance filter\r
 REM\r